Merge pull request #144 from gpsbabel/fix_bad_merge
authorRobert Lipe <robertlipe@users.noreply.github.com>
Sun, 15 Apr 2018 07:41:32 +0000 (02:41 -0500)
committerGitHub <noreply@github.com>
Sun, 15 Apr 2018 07:41:32 +0000 (02:41 -0500)
Loosen coupling of upgrade queries to OS version by using newer (2014) Qt services.

1  2 
gui/app.pro
shape.cc

diff --cc gui/app.pro
Simple merge
diff --cc shape.cc
Simple merge